force inclusion of xen/config.h through compiler option

As we expect all source files to include the header as the first thing
anyway, stop doing this by repeating the inclusion in each and every
source file (and in many headers), but rather enforce this uniformly
through the compiler command line.

As a first cleanup step, remove the explicit inclusion from all common
headers. Further cleanup can be done incrementally.

Signed-off-by: Jan Beulich <jbeulich@suse.com>
Acked-by: Keir Fraser <keir@xen.org>

diff --git a/xen/Rules.mk b/xen/Rules.mk
index 59c7dd757779658e6d91af18310ecc5bc0a17265..37c6a79987d70b10c149517a7c7127e7ec3ad02b 100644 (file)
--- a/xen/Rules.mk
+++ b/xen/Rules.mk
@@ -41,7 +41,7 @@ ALL_OBJS-y               += $(BASEDIR)/xsm/built_in.o
 ALL_OBJS-y               += $(BASEDIR)/arch/$(TARGET_ARCH)/built_in.o
 ALL_OBJS-$(x86)          += $(BASEDIR)/crypto/built_in.o
 
-CFLAGS-y                += -g -D__XEN__
+CFLAGS-y                += -g -D__XEN__ --include $(BASEDIR)/include/xen/config.h
 CFLAGS-$(XSM_ENABLE)    += -DXSM_ENABLE
 CFLAGS-$(FLASK_ENABLE)  += -DFLASK_ENABLE -DXSM_MAGIC=0xf97cff8c
 CFLAGS-$(FLASK_ENABLE)  += -DFLASK_DEVELOP -DFLASK_BOOTPARAM -DFLASK_AVC_STATS
@@ -59,7 +59,7 @@ ifneq ($(max_phys_irqs),)
 CFLAGS-y                += -DMAX_PHYS_IRQS=$(max_phys_irqs)
 endif
 
-AFLAGS-y                += -D__ASSEMBLY__
+AFLAGS-y                += -D__ASSEMBLY__ --include $(BASEDIR)/include/xen/config.h
 
 # Clang's built-in assembler can't handle .code16/.code32/.code64 yet
 AFLAGS-$(clang)         += -no-integrated-as

diff --git a/xen/include/xen/bitmap.h b/xen/include/xen/bitmap.h
index a8cd593d23ae796fd39609d9396171adfc34a026..56fe602adf86b6793c825e349c53347cb5672255 100644 (file)
--- a/xen/include/xen/bitmap.h
+++ b/xen/include/xen/bitmap.h
@@ -3,7 +3,6 @@
 
 #ifndef __ASSEMBLY__
 
-#include <xen/config.h>
 #include <xen/lib.h>
 #include <xen/types.h>
 #include <xen/bitops.h>

diff --git a/xen/include/xen/byteorder/swab.h b/xen/include/xen/byteorder/swab.h
index 0193ff83e72008c24731753fc4fd12de7e4441f2..b7e30f050385e60c0ceb3036697809d022084575 100644 (file)
--- a/xen/include/xen/byteorder/swab.h
+++ b/xen/include/xen/byteorder/swab.h
@@ -10,8 +10,6 @@
  *    to clean up support for bizarre-endian architectures.
  */
 
-#include <xen/compiler.h>
-
 /* casts are necessary for constants, because we never know how for sure
  * how U/UL/ULL map to __u16, __u32, __u64. At least not in a portable way.
  */

diff --git a/xen/include/xen/cache.h b/xen/include/xen/cache.h
index f972dc30d4acd56342f95ee9bf35c39d09544cc8..6ee174efa43937b79345709fa8ce75d017a65f50 100644 (file)
--- a/xen/include/xen/cache.h
+++ b/xen/include/xen/cache.h
@@ -1,7 +1,6 @@
 #ifndef __LINUX_CACHE_H
 #define __LINUX_CACHE_H
 
-#include <xen/config.h>
 #include <asm/cache.h>
 
 #ifndef L1_CACHE_ALIGN

diff --git a/xen/include/xen/compat.h b/xen/include/xen/compat.h
index c78095cb63461fd6fb1fbf49b32c60d429d6af12..857cbc77c868ba816ee8e32827ac7332c06430ee 100644 (file)
--- a/xen/include/xen/compat.h
+++ b/xen/include/xen/compat.h
@@ -5,8 +5,6 @@
 #ifndef __XEN_COMPAT_H__
 #define __XEN_COMPAT_H__
 
-#include <xen/config.h>
-
 #ifdef CONFIG_COMPAT
 
 #include <xen/types.h>

diff --git a/xen/include/xen/cpumask.h b/xen/include/xen/cpumask.h
index db539486638ef00617ac5583552caf1c7e3456e0..1aa1412d89538cb5bde1313da107be96b22f365b 100644 (file)
--- a/xen/include/xen/cpumask.h
+++ b/xen/include/xen/cpumask.h
@@ -75,7 +75,6 @@
  *    inside a macro, the way we do the other calls.
  */
 
-#include <xen/config.h>
 #include <xen/bitmap.h>
 #include <xen/kernel.h>
 

diff --git a/xen/include/xen/ctype.h b/xen/include/xen/ctype.h
index f6520e7194ac02e084bb4ef5ca13a50f8db64c4e..6dec944a370b23d983c285002c652741dd698b53 100644 (file)
--- a/xen/include/xen/ctype.h
+++ b/xen/include/xen/ctype.h
@@ -1,8 +1,6 @@
 #ifndef _LINUX_CTYPE_H
 #define _LINUX_CTYPE_H
 
-#include <xen/config.h>
-
 /*
  * NOTE! This ctype does not handle EOF like the standard C
  * library is required to.

diff --git a/xen/include/xen/domain_page.h b/xen/include/xen/domain_page.h
index a7df10b1ad93f860c732cf93d191687b110c7077..9feddae84cc9027dfa8ca5516a20f3de147d3fe1 100644 (file)
--- a/xen/include/xen/domain_page.h
+++ b/xen/include/xen/domain_page.h
@@ -9,7 +9,6 @@
 #ifndef __XEN_DOMAIN_PAGE_H__
 #define __XEN_DOMAIN_PAGE_H__
 
-#include <xen/config.h>
 #include <xen/mm.h>
 
 #ifdef CONFIG_DOMAIN_PAGE

diff --git a/xen/include/xen/event.h b/xen/include/xen/event.h
index 7e5ad7b9d2965d73ae8c6f7f95549d883ebff9e7..232d50e06ddb71a2fd23f3df949540715f3cb21a 100644 (file)
--- a/xen/include/xen/event.h
+++ b/xen/include/xen/event.h
@@ -9,7 +9,6 @@
 #ifndef __XEN_EVENT_H__
 #define __XEN_EVENT_H__
 
-#include <xen/config.h>
 #include <xen/sched.h>
 #include <xen/smp.h>
 #include <xen/softirq.h>

diff --git a/xen/include/xen/grant_table.h b/xen/include/xen/grant_table.h
index c161705ca9a753d115a50d0def51a1fc1325cedd..80817608b6cfb57aafcafc825b8d1c8ab7e4c872 100644 (file)
--- a/xen/include/xen/grant_table.h
+++ b/xen/include/xen/grant_table.h
@@ -24,7 +24,6 @@
 #ifndef __XEN_GRANT_TABLE_H__
 #define __XEN_GRANT_TABLE_H__
 
-#include <xen/config.h>
 #include <public/grant_table.h>
 #include <asm/grant_table.h>
 

diff --git a/xen/include/xen/hypercall.h b/xen/include/xen/hypercall.h
index 3d099a65cde21d6f8301ebda4fd2c38e83a742a8..73b1598cacb25efc1d55ce7b462214562ec46844 100644 (file)
--- a/xen/include/xen/hypercall.h
+++ b/xen/include/xen/hypercall.h
@@ -5,7 +5,6 @@
 #ifndef __XEN_HYPERCALL_H__
 #define __XEN_HYPERCALL_H__
 
-#include <xen/config.h>
 #include <xen/types.h>
 #include <xen/time.h>
 #include <public/xen.h>

diff --git a/xen/include/xen/init.h b/xen/include/xen/init.h
index 220d464fc7343135f8f498a5b719a9e98dac4f8a..f7a7dc4d9d57da43b2dc4f0f54f6181fd3271b01 100644 (file)
--- a/xen/include/xen/init.h
+++ b/xen/include/xen/init.h
@@ -1,7 +1,6 @@
 #ifndef _LINUX_INIT_H
 #define _LINUX_INIT_H
 
-#include <xen/config.h>
 #include <asm/init.h>
 
 /*

diff --git a/xen/include/xen/inttypes.h b/xen/include/xen/inttypes.h
index 2163244326bbe02339418dd075706b39a3f514aa..e90c55f12000828b445dc03892fe7838bf93c6d6 100644 (file)
--- a/xen/include/xen/inttypes.h
+++ b/xen/include/xen/inttypes.h
@@ -23,7 +23,6 @@
 #ifndef _XEN_INTTYPES_H
 #define _XEN_INTTYPES_H        1
 
-#include <xen/config.h>
 #include <xen/types.h>
 
 # if BITS_PER_LONG == 64

diff --git a/xen/include/xen/irq.h b/xen/include/xen/irq.h
index a2a90e1a34d643773ccf33f30f71fa6346a2c0c7..7afc64ab26209d0d4ca0fb4fecc6a8a8d32b62c5 100644 (file)
--- a/xen/include/xen/irq.h
+++ b/xen/include/xen/irq.h
@@ -1,7 +1,6 @@
 #ifndef __XEN_IRQ_H__
 #define __XEN_IRQ_H__
 
-#include <xen/config.h>
 #include <xen/cpumask.h>
 #include <xen/rcupdate.h>
 #include <xen/spinlock.h>

diff --git a/xen/include/xen/irq_cpustat.h b/xen/include/xen/irq_cpustat.h
index 94957996bb517bf17afe269fa1ec0f8c1b311cb8..73629f6ec80e6d3272a2e26fac93bec7aa2bcc9c 100644 (file)
--- a/xen/include/xen/irq_cpustat.h
+++ b/xen/include/xen/irq_cpustat.h
@@ -9,7 +9,6 @@
  * Keith Owens <kaos@ocs.com.au> July 2000.
  */
 
-#include <xen/config.h>
 #include <asm/hardirq.h>
 
 /*

diff --git a/xen/include/xen/lib.h b/xen/include/xen/lib.h
index 3e3a0caf8b0f14a5e91a13ab68add9c737a7bad2..c8cd9fca0ec2274e143a7b92d3a4006cee6a10ca 100644 (file)
--- a/xen/include/xen/lib.h
+++ b/xen/include/xen/lib.h
@@ -3,7 +3,6 @@
 
 #include <xen/inttypes.h>
 #include <xen/stdarg.h>
-#include <xen/config.h>
 #include <xen/types.h>
 #include <xen/xmalloc.h>
 #include <xen/string.h>

diff --git a/xen/include/xen/mm.h b/xen/include/xen/mm.h
index 63c47099f7999b47b8b9ff7eb74fd16addb83973..cea95b27f8641776207b2893291c19b810860b88 100644 (file)
--- a/xen/include/xen/mm.h
+++ b/xen/include/xen/mm.h
@@ -28,7 +28,6 @@
 #ifndef __XEN_MM_H__
 #define __XEN_MM_H__
 
-#include <xen/config.h>
 #include <xen/types.h>
 #include <xen/list.h>
 #include <xen/spinlock.h>

diff --git a/xen/include/xen/notifier.h b/xen/include/xen/notifier.h
index e9519e2f762060c036f0068bd113fcd717a21c5b..d1ff9b199ab1afa2f23b6e0fbb2ceacf69509cd6 100644 (file)
--- a/xen/include/xen/notifier.h
+++ b/xen/include/xen/notifier.h
@@ -10,7 +10,6 @@
 #ifndef __XEN_NOTIFIER_H__
 #define __XEN_NOTIFIER_H__
 
-#include <xen/config.h>
 #include <xen/types.h>
 #include <xen/errno.h>
 #include <xen/kernel.h>

diff --git a/xen/include/xen/numa.h b/xen/include/xen/numa.h
index 2be38349b5929a0b2722c427180fc702d2a56886..ac4b391d3ab27f2be9c6570a125f8546b7e479b7 100644 (file)
--- a/xen/include/xen/numa.h
+++ b/xen/include/xen/numa.h
@@ -1,7 +1,6 @@
 #ifndef _XEN_NUMA_H
 #define _XEN_NUMA_H
 
-#include <xen/config.h>
 #include <asm/numa.h>
 
 #ifndef NODES_SHIFT

diff --git a/xen/include/xen/paging.h b/xen/include/xen/paging.h
index abe276d04981215c18e675b16cfcc81881e6a821..213ece43aac6ed44573cea02c6c056c8759bbb38 100644 (file)
--- a/xen/include/xen/paging.h
+++ b/xen/include/xen/paging.h
@@ -2,8 +2,6 @@
 #ifndef __XEN_PAGING_H__
 #define __XEN_PAGING_H__
 
-#include <xen/config.h>
-
 #if defined CONFIG_PAGING_ASSISTANCE
 
 #include <asm/paging.h>

diff --git a/xen/include/xen/pci.h b/xen/include/xen/pci.h
index 0e0d1042e18a64d05552c22a1ec22aa8c0927bb3..759f1aacf752f5bf8b396f3f01208dc1d69f8bbe 100644 (file)
--- a/xen/include/xen/pci.h
+++ b/xen/include/xen/pci.h
@@ -7,7 +7,6 @@
 #ifndef __XEN_PCI_H__
 #define __XEN_PCI_H__
 
-#include <xen/config.h>
 #include <xen/types.h>
 #include <xen/list.h>
 #include <xen/spinlock.h>

diff --git a/xen/include/xen/percpu.h b/xen/include/xen/percpu.h
index 9366d18750f7dd915ce24c265ccb18a6747c326a..abe0b1187faffc1257edf9bcfff5b139a87043d0 100644 (file)
--- a/xen/include/xen/percpu.h
+++ b/xen/include/xen/percpu.h
@@ -1,7 +1,6 @@
 #ifndef __XEN_PERCPU_H__
 #define __XEN_PERCPU_H__
 
-#include <xen/config.h>
 #include <asm/percpu.h>
 
 /*

diff --git a/xen/include/xen/preempt.h b/xen/include/xen/preempt.h
index f4228058e524cb273032635a1588c52cd08f0244..fd02ada12bc1464e81162f73b6f0662cf9159a3d 100644 (file)
--- a/xen/include/xen/preempt.h
+++ b/xen/include/xen/preempt.h
@@ -9,7 +9,6 @@
 #ifndef __XEN_PREEMPT_H__
 #define __XEN_PREEMPT_H__
 
-#include <xen/config.h>
 #include <xen/types.h>
 #include <xen/percpu.h>
 

diff --git a/xen/include/xen/radix-tree.h b/xen/include/xen/radix-tree.h
index 15d88a2844ccafb6c2911254edf788d1802439a6..faf25453a3328876157ca6d19d7c370f4413efc3 100644 (file)
--- a/xen/include/xen/radix-tree.h
+++ b/xen/include/xen/radix-tree.h
@@ -20,7 +20,6 @@
 #ifndef _XEN_RADIX_TREE_H
 #define _XEN_RADIX_TREE_H
 
-#include <xen/config.h>
 #include <xen/types.h>
 #include <xen/lib.h>
 #include <xen/rcupdate.h>

diff --git a/xen/include/xen/sched.h b/xen/include/xen/sched.h
index 3904afe7e526a36fe401f237e85b0cb95fe71dfb..6441546401853d5d9abc1ee94ab2e4c71fafd419 100644 (file)
--- a/xen/include/xen/sched.h
+++ b/xen/include/xen/sched.h
@@ -2,7 +2,6 @@
 #ifndef __SCHED_H__
 #define __SCHED_H__
 
-#include <xen/config.h>
 #include <xen/types.h>
 #include <xen/spinlock.h>
 #include <xen/shared.h>

diff --git a/xen/include/xen/shared.h b/xen/include/xen/shared.h
index 528c8b77c5ca00c6c3cfcc0acb2a124b491fccb2..19c79fdf58395330fffe84e84318a836c8815d37 100644 (file)
--- a/xen/include/xen/shared.h
+++ b/xen/include/xen/shared.h
@@ -1,8 +1,6 @@
 #ifndef __XEN_SHARED_H__
 #define __XEN_SHARED_H__
 
-#include <xen/config.h>
-
 #ifdef CONFIG_COMPAT
 
 #include <compat/xen.h>

diff --git a/xen/include/xen/smp.h b/xen/include/xen/smp.h
index 536c229d452125ea5e28dfaa195ba7696211bea6..e05f3903ab878290756b4bbd94b84952d82ef74d 100644 (file)
--- a/xen/include/xen/smp.h
+++ b/xen/include/xen/smp.h
@@ -1,7 +1,6 @@
 #ifndef __XEN_SMP_H__
 #define __XEN_SMP_H__
 
-#include <xen/config.h>
 #include <asm/smp.h>
 
 /*

diff --git a/xen/include/xen/softirq.h b/xen/include/xen/softirq.h
index 14c003db2fa8be3c6c3141ef8a01a101ead0e7a4..193351deffc890a5b0431e9a40855925b075e687 100644 (file)
--- a/xen/include/xen/softirq.h
+++ b/xen/include/xen/softirq.h
@@ -11,7 +11,6 @@ enum {
     NR_COMMON_SOFTIRQS
 };
 
-#include <xen/config.h>
 #include <xen/lib.h>
 #include <xen/smp.h>
 #include <asm/bitops.h>

diff --git a/xen/include/xen/spinlock.h b/xen/include/xen/spinlock.h
index f1506c1ecb9f7ca2da9f2aba5f8f8b46b72eb9b7..2df44527096ce8613c6918dd33e87b437ff825ac 100644 (file)
--- a/xen/include/xen/spinlock.h
+++ b/xen/include/xen/spinlock.h
@@ -1,7 +1,6 @@
 #ifndef __SPINLOCK_H__
 #define __SPINLOCK_H__
 
-#include <xen/config.h>
 #include <asm/system.h>
 #include <asm/spinlock.h>
 

diff --git a/xen/include/xen/symbols.h b/xen/include/xen/symbols.h
index 082d707469e0e3d9777c3e572becbe0f4274db7d..5215b9a6972be7be6aef7c4e4f92253015e70e68 100644 (file)
--- a/xen/include/xen/symbols.h
+++ b/xen/include/xen/symbols.h
@@ -1,7 +1,6 @@
 #ifndef _XEN_SYMBOLS_H
 #define _XEN_SYMBOLS_H
 
-#include <xen/config.h>
 #include <xen/types.h>
 
 #define KSYM_NAME_LEN 127

diff --git a/xen/include/xen/tmem_xen.h b/xen/include/xen/tmem_xen.h
index 76ab44069e0de06ef0a182db7a32c16d2f02e271..5529b14dbd31d062be9217cd5c65c5d658b96a3c 100644 (file)
--- a/xen/include/xen/tmem_xen.h
+++ b/xen/include/xen/tmem_xen.h
@@ -9,7 +9,6 @@
 #ifndef __XEN_TMEM_XEN_H__
 #define __XEN_TMEM_XEN_H__
 
-#include <xen/config.h>
 #include <xen/mm.h> /* heap alloc/free */
 #include <xen/xmalloc.h> /* xmalloc/xfree */
 #include <xen/sched.h>  /* struct domain */

diff --git a/xen/include/xen/trace.h b/xen/include/xen/trace.h
index f16b3d5c0634d839cd3864f1d08d03028a99422d..b32f6c58037695e458e8a003f8a94a81caea450d 100644 (file)
--- a/xen/include/xen/trace.h
+++ b/xen/include/xen/trace.h
@@ -23,7 +23,6 @@
 
 extern int tb_init_done;
 
-#include <xen/config.h>
 #include <public/sysctl.h>
 #include <public/trace.h>
 #include <asm/trace.h>

diff --git a/xen/include/xen/types.h b/xen/include/xen/types.h
index fd89c98427238e01eb96f8f58214dad7b60791b8..ac9664799d0dbd0aa75740e91f619f7efb394b33 100644 (file)
--- a/xen/include/xen/types.h
+++ b/xen/include/xen/types.h
@@ -1,7 +1,6 @@
 #ifndef __TYPES_H__
 #define __TYPES_H__
 
-#include <xen/config.h>
 #include <asm/types.h>
 
 #define BITS_TO_LONGS(bits) \

diff --git a/xen/include/xen/vga.h b/xen/include/xen/vga.h
index 04100778e1de63bd79cfc4e6b345ba9cef8b8103..cc690b9ba234493e14598a9ee5b8f43fa125b5df 100644 (file)
--- a/xen/include/xen/vga.h
+++ b/xen/include/xen/vga.h
@@ -9,7 +9,6 @@
 #ifndef _XEN_VGA_H
 #define _XEN_VGA_H
 
-#include <xen/config.h>
 #include <public/xen.h>
 
 #ifdef CONFIG_VGA

diff --git a/xen/include/xen/xenoprof.h b/xen/include/xen/xenoprof.h
index df4c842bbf59e6e1b6dc10771fc453ff6025029c..845ea86011fd630548683dcee18cf4e75317fd72 100644 (file)
--- a/xen/include/xen/xenoprof.h
+++ b/xen/include/xen/xenoprof.h
@@ -10,7 +10,6 @@
 #ifndef __XEN_XENOPROF_H__
 #define __XEN_XENOPROF_H__
 
-#include <xen/config.h>
 #include <xen/inttypes.h>
 #include <public/xenoprof.h>
 #include <asm/xenoprof.h>